workspace: Punt the geometry-fizzling-out logic here

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 7bd153bee26510e2abb045509683f43770b867a7..ee3b636f5114c1d2817e3f1065a66de73d94a099 100644 (file)
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -892,6 +892,19 @@ function padArea(area, padding) {
     };
 }
 
+function rectEqual(one, two) {
+    if (one == two)
+        return true;
+
+    if (!one || !two)
+        return false;
+
+    return (one.x == two.x &&
+            one.y == two.y &&
+            one.width == two.width &&
+            one.height == two.height);
+}
+
 /**
  * @metaWorkspace: a #Meta.Workspace, or null
  */
@@ -967,11 +980,17 @@ const Workspace = new Lang.Class({
     },
 
     setFullGeometry: function(geom) {
+        if (rectEqual(this._fullGeometry, geom))
+            return;
+
         this._fullGeometry = geom;
         this._recalculateWindowPositions(WindowPositionFlags.NONE);
     },
 
     setActualGeometry: function(geom) {
+        if (rectEqual(this._actualGeometry, geom))
+            return;
+
         this._actualGeometry = geom;
 
         if (this._actualGeometryLater)

diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index d364de6f9e6263ac769235b90b4d009a8eb770bd..085d16223fb095abde107d49ebfca9d4db220d90 100644 (file)
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -23,19 +23,6 @@ const MAX_WORKSPACES = 16;
 
 const OVERRIDE_SCHEMA = 'org.gnome.shell.overrides';
 
-function rectEqual(one, two) {
-    if (one == two)
-        return true;
-
-    if (!one || !two)
-        return false;
-
-    return (one.x == two.x &&
-            one.y == two.y &&
-            one.width == two.width &&
-            one.height == two.height);
-}
-
 const WorkspacesView = new Lang.Class({
     Name: 'WorkspacesView',
 
@@ -140,9 +127,6 @@ const WorkspacesView = new Lang.Class({
     },
 
     setFullGeometry: function(geom) {
-        if (rectEqual(this._fullGeometry, geom))
-            return;
-
         this._fullGeometry = geom;
 
         for (let i = 0; i < this._workspaces.length; i++)
@@ -150,9 +134,6 @@ const WorkspacesView = new Lang.Class({
     },
 
     setActualGeometry: function(geom) {
-        if (rectEqual(this._actualGeometry, geom))
-            return;
-
         this._actualGeometry = geom;
 
         for (let i = 0; i < this._workspaces.length; i++)